Form Factor improvements