eXtend function and small fixes - Version 2.1.2b