improving performance =)