Add some BUGS