applied same changes to other methods