Added 3616 + Altered 3618

Added and tested 3616, remove specularity for 3618 due to the type of
surface.