added proper Close behaviour
rename