improve get method