Updated: removed unused codes