waiting for save and view bugs to get fixed