Removed rush stuff