fun and bug fix
merge