AES now working fully