Last changes

These are last changes i hope