Updated according to master
Added pictaaaa