Last changes made for design