some changes to make it more responsive