Tidied up, cleared DB id problem