ADDED further functionality