Bugs and AK2 added