Updating my branch with raul's changes manually