finishing up with master and storage