replaced a lot of siz for slot
Merge branch 'katina-0.1' into katina-0.2