Added colour, fixed constructor