commit pedro \o/ ver3