New position working (but needs optimizations)