changed stuff by Markus