changed Long to Int for Database ID