Added return s and a