Some more finalized changes