Just some modifications