Add first time and testing