Few modifications to make things bit simpler