Small Modifications to y/n function