merged with john and changed colors