synchronize with fabian and alwins code&improved the performance