Inlined method
Changed some stuff