updated with correct coloring and non-funky lines