implemented kaezas suggestion