Changes + bug fixing