added user_id field during creation
clean up