Added ending, fixed sizes at beginning