forgot some updates in the last commit of these