removed some console.logging