Refactored things to remove hardcoded logic around position