made storage and rank work properly