Updated

Added functionality