Fixed all in