CHANGE: Refactoring to make blocks more independant