cleaned up bockish dirty solution