Modified 2 classes by yooduknam