added more code, continue with BD