fixed design && added literals