Refractored and added dummy sections