imported changes by "Master of Little"