removed colours and fixed null pointer bug