updated various methods