Recommendation for fish/aquarium stores in Singapore

I visited Clementi Aquarium and Florist while there, they're only a short walk from the MRT [can't remember which stop sorry] and are the typical jam-packed Asian LFS. Heaps of cool fish on display, Asian arowana by the tankful, rays, etc etc. Also went to another smaller one, the owner is/was a member here and posts in the vendor forum, I've completely forgotten the name of it but it was a little less hectic but had some very cool fish too.