Update 1.1 by Ziko