Changes for a nice press-behavior