Fixing the present stuff