this will be done on phase 2 after html refactor