Removed defaulting