Updated. A few more methods done