AI #4 issue fixed, much nicer and cleaner design