extand classes improved