nicer + fixed falling off