Incremental update. Added modals.
However, app crashing. Committed this change to rollback and debug