2nd stage
Remove bugs