cleaned up to make responsive