Some more modifications. Not working, though (Casta is calling).