Refactored names of methods
Added feature to account for positive and negative locations