changed few things...