Changed storage subroutine
Minor changes