Reverted code to most simple form for testing.