Simplified a little