Added maker layer and control