Fixed part 3
Merge https://github.com/SwiftSpear/BnE431