Merge Top's and Ana's files

Signed-off-by: Chulakorn Aritajati <chulakornaritajati@gmail.com>