Feature/bugs bunny