and this part is probably not needed anymore?