now this is working as before