Optimizations + added PSDs