Matejs changes

Check this out.