current Working code