hopefully more or less working and not very ugly solution
merge solution to show overriding others