Updated some functionality