Used existing method in more places