#75 adjusted equal to wrapper classes. Works but doesn't do what it should do