synced in changes from littlemousy and Wendy (Git)

f***