added lockings, added colors