First working version without any print hack