extended with shell and push button support