added simon code to test still needs fixing though