BLEN-40 Updated but not refactored. will do at later stage