Fixes, revamp of method