Preparing to make it responsive