Finished up edge cases