Big smart decorator and few locks added