Fix #36 anhanced backend functionalities new2

Not need to keep commented code.