01.07.14 changed and unified interface