Just some code improvisations