Updates by Osmoflo