Improved some designs