Changes according to comments by AK. Work in progress...
Ignore some stuff