prepare for fission
better naming