Removed commented oout experimental code