Ramiro's feature

My bug feature