Updated a last changes made by me and shiio