Added functionality and design issues