An attempt to improve performance - reduce number of methods calls