Modified to conform to new scenev
Worked away some dialyzer errors