Finally got a chance to long on and update everything