Added more bugs