Removed color dependency