final changes for mock ups