before merge
bug fixes