This commit is a different approach to same features achieved in earlier
commits