Some removed and merged