Revert "Updates with improvements"

This reverts commit 402f8bb95ff3c31b258afa8aba9bf42e0b459465.