Added are Units and modified design