Features

Added some buging features