 		color = bulgeColor;
 #if 1
 		const float  Mstar = sBulge.sampleMass(id);
-		const float4 Cstar = Colours[sBulge.getColour(Mstar)];
+		const float4 Cstar = sBulge.getColour(Mstar);
 		const float fdim = 0.01f;
 		color = Cstar * make_float4(fdim, fdim, fdim, 2.0f);
 #endif


#if 0
	const int N = 7;
	const float4 Colours[N] = 
	{  /* colours for different spectral classes: Oh Be A Fine Girl Kiss Me */
		make_float4(189.0f, 188.0f, 239.0, 1.0f),  /* O-star */
		make_float4(203.0f, 214.0f, 228.0, 1.0f),  /* B-star */

	};
#else
	const int N = 16;
	float4 Colours[N] = 
	{  /* colours for different spectral classes: Oh Be A Fine Girl Kiss Me */
		make_float4( 32.0f,  78.0f, 255.0f, 1.0f),  /* O0 */
		make_float4( 62.0f, 108.0f, 255.0f, 1.0f),  /* O5 */
