Finalizing changes by @araslanov-e