Cleaned up and made seaking work better