worked on AI
merging