color after small merge issue, but mostly i did awesome at it :)