Removed bacon and simplified code a bit