hopefully reverted to working version
hopefully reverted to working version2