Changed method order for better organization