Updates

Please check these commits. Would be good if they were in semaphore.

Thank You