Added margin for better feeling
Balancing no printing time
Merged develop