Changes for using the relative and not the absolute tokenposition