Production ready fig changes