updated -> add color and reduce bugs (collision part)