working on making it faster and better still a bit slow