changes .. xD .. almost working