Started adding respnsiveness