Removed premature stuff...