hi
merge pappy local
local changes? hm
added if on_ec2 conditions