Replased some functions