new delete layout and functionality - workin