Changes as per RaNaN's request