renovated some stuff