Removed method, reduced to 4 lines