Modifications

Signed-off-by: AppleMaster <cheeckan@gmail.com>