Simplified it a bit