Still testing different methods
Removed unnecessary complexity