provided some ugly fixes to make it work for A2036, keep eyes open for fails in other subjects