Adding subs for storm