storing mechanism adjusted
Merge origin/master