major overhaul, also added green removed blue