Simplified a bit