Removed generic mess..