Final Changes again with new return in constructor