storage added, and markup fixed