Test
Fixed Common-Functions.. hopefully